From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 2 Mar 2011 04:40:07 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~2266^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=4a8b879b87962d5f37c05d3650f43cc571b22bc7;p=emacs.git

Merge from mainline.
---

4a8b879b87962d5f37c05d3650f43cc571b22bc7